Further refactoring of datastore layers
Initial integration couchbase
Initial couchbase integration completed; refactored to reduce redundancy