modified core to actually use ServerProxy instead of CommonProxy for server side proxy