Added network ID resolution client side for entities