Updates for -exception based- and markdown format