Add Markdown/Markup support