Replace raw datastore calls with NDS package [#80860512]