Refactor and add another proxy