Added template and value mappings