Updated some classes to be current with classes in the prototype branch