add guava library. add null check for datastore