UI integration changes