Added handling for analog controller