Fixes to Dataset model entity