Add cursor support