Templates updated to reflect new structure