Added support for opendaq-s