Added support for multiple objects