Improve Command Cursor suport