Added cursor support for collection