Moved template into separate file
Merged from feature branch