WIP: Make generator more customizable