Configuration source fix and code improvements avoid the null reference exception
XSD schema fix