Added cursor support