Revise API to reflect new datastore functionality