Changed generators to allow multiple user classes

(cherry picked from commit 4f7c0f9efa5cf6c3146d427612efd8e1bcd2961e)