Added dependency on 'metadata-common' and 'metadata-rdf'
Updated Factory