MetadataManager - refactored to work with class name only instead of ent...

...ity object