Major updates to move datastore to base Google data API.