Added basic HTML5 support