Added support for functions, function calls and field declarations