Replaced MetadataFactory with DisconnectedMetadataFactory

fixes #230