Support Cursor, close #3