Added cursors support