Added support for multiple versus single object defintions