* Changed template structure