Moved the dataUtil to seperate util files