Couple little default fixes
Extracted TemplateHandler
Adding environment decorators