Building out remaining template fields