Refactor Joystick API