Add datastore functionality
6 files changed