Added support to while and for stmts