Added the final classes from utility.