Major overhaul of Uniq interface