Some revisions to limit the number of classes generated.
Updates to reduce number of classes generated.