Add while loop support