Added new classes to suite