Reworked proxy