Moved template into separate file