Add support for while and do_while