Combine input generator code into main branch