Refactors to use IHsdbDataUtil