Close #3: adding support for NML SwitchingService