Changed base generators to classes