broadening support for functions and objects