Add better cursors management