added support for multiple types of objects