Refactoring ObjectProxy Class