Feel free to send a PR on the generator system.