Updated classes to match raders UML