Updated support for function parameters
Fixed constructor support
Improved support for defs