Improve command line mode mappings