#7, #8 - adding xsds