Update based on Application instead of UiApp