Added cursor support in the client