Improved org-mode support