Add support for FOR/WHILE
Fixed range support