Adding MetadataManager and removing unused constants