Added all the classes as how they were defined in the Class diagram