Added temporary validator and fixed issues with XSD validation