Refactoring and adding some templates