Rdf calc now incapsulated