Modifed classes to use the vision utility files.