Introduced new templates & major refactoring