Improved HTML5 support