Fix method to add metadata to appropriate storage mappings