Add support for objects and functions