better support for google datastore