Added preliminray support for function values