Changed template structure