Refactored location of output template