Improve org mode support