porting old data store to new data store architecture