Add Joystick support