Made some changes due to the changes in the xsds.
Authored by: grether 2008-02-08
Parent: [r603]
Child: [r605]