In the middle of refactoring RData and RDCollections