Added content and markdown support