Changed basic template structure