Added more gamepad support