Added support for program flow and function calls