Changes for new network configuration at P1