SW-20 Changed Generator class