Updated Templates with new action hooks