[FEATURE] refactored templates