Added HTML5 support