Finally opened up access to the datastore
Minor changes