- Added two new classes