Add attributes and HTML5 only