Rework generator to work under vanilla rjb