Started refactoring of MetadataTypeManager. refs #445