Updated to use datastore 3.4