Added if statement generation
Added While and for loops