Re-implemented joystick support