Added support for passing button presses