Add support for RDF Class and Property