edited classes, added ExceptionClasses