Adjusted for new UIContext class