Improved gamepad support