Add multiple cursor support