Improved semantic markup