Allow custom generator classes to be used