Modify user input handling