Add cursor mode support
Renaming
Expose more functions