UiExtension improvments