Added more to main structure of generator.c