Added subclass hooking