Optimize imports
Add MetadataMap constructor