Adding HTML5 support