Refactoring, added support for multiple objects