Input fields refactor part I.