Added support for functions
Collect constant values