Refactoring of the Proxy service