Replace raw datastore calls with NDS package [#80860512]
Merge pull request #4 from mrvdot/alpha/use-nds

Replace raw datastore calls with NDS package [#80860512]