Some changes from RDFPyUtils