Modified some of the classes