Added better support for hooking getters/setters