Added enable/disable mab functions to Switch