Updated CommonProxy