Improve generator performance
7 files changed