Applying UI InputType refactoring