update class generator (part 2)