Datastore handling added. Updated to the latest changes in API.