More progress on generator support