Revisions to limit the number of classes generated.