Improve generator.