Update for HTML5 elements