Updated the hook subsystem, basic integration