Put non-components on the templateObjects directly

Solves gh-1148