Updated some utility classes.