Datastore class additions

Adds the datastore required classes and functions.