Adding new functions to support map, template curation