ClubUML 51/91 - Updates to the parser logic and added new classes