Added while loop support