Changes to DataUtil methods to make more consistent