Adds cursor support