Merge "Add proper references to xml schemas"