Adding few changes for W3C