Added data-factory, owl-types, annotations