Improved the classes of the Controllers.