First iteration of changes to metadata mappings