refactoring proxy package