Major CommonProxy changes