Add check of unit class of datastore items

(closes #151)