Cursor portability - Reorganisation