new simplified template structure