Changed to markdown and added field