[IMPROVEMENT] Add contract in Datastore wrapper methods