[#972] After a discussion with @vitorbaptista, we decided to stick with datastore resource instead of datastore table