Rework DSO API conditions and configuration option