Switch Manager improved.