Updated to new kairos datastore interface