Added missing use of MetaDataFactory