Updated to new MS XML format