Update to UI API 9