Finished restructuring the manager hooks.