refactored some of the methods for correctly supporting the MakerHook
feature