Remaining changes for hierarchies and IMS RDF