Updated the templates
General implementation changes