Move to new generator syntax