@nbigaouette, nice approach, maybe try to handle that in the abstract "monkey patching" class?