OutputHandler refactored
OutputTemplateBuilder ...