Input class refactoring.