Added basic infrastructure for input handling