Adding more better template creation tool