reworked xml schema