Added support for templates collection fields