Added <pre> and <samp> elements