completed generic Map switchover