MetaDataStorage not needed, we have now ComponentStorage