Update the model to be w3c valid