AGPUSH-381 "Improve the DataStore interface"