Improve generator