Changed generators to allow multiple user classes

(cherry picked from commit 8d16138956ee08acf2990fc6e5391b0fe9257b78)