adding datastore api
re-org of apis