Move support class to the util package
Minor fix, prepare refactor