Added joystick support