Added joystick support for wrapper