More changes to generator