Added slot for switch