more support for different kinds of objects
2 files changed