Adjustments for UI integration