Made the switch to Google Datastore for persistant storage