Updated for new version of org-mode