Added parsing of function calls