upgrade to follow xmtpl: maps for attributes