Refactoring. Object instances now related to 'object' service instead of 'proxy'.