A better set of classes