Worked on the utility classses.