better template management