refactored some namespaces, added some new convenience data servce methods and associated tests