Added preliminary cursor support