Updated switch & server schema