Refactor UiITSuport for easier reading