UOS enhancement