Improved general classes