Add support for metadata to def-map-type