Adding templates and making some updates