adapt to changes in uos_core
adapt to changes in uos_core