Added more control over cursors