Updated classes based on UML recieved 4.2.2013