Values now follow 2.1 xsd