Updated the CommonProxy