Added input handling options