Added generic template structure