Added generic cursor support