Move functions to Enable hook

Move functions to 'enable' hook