Refactoring proxy behavior (in progress)