InputHandler refinement