Updates for new Markdown support