Some changes with UiModules