Feature #43, refactored templates