Added new classes and changed the classdiagram