Extensions to UI 2 prototype