Merge branch 'refactor-generator'