Adapting to changes in uos_core