Better support for cursors, to be tested
Cursor tested