Refactored templates. Simplified model