Made some improvements to the utility classes.