Made yes/no switch configurable