Cleaned up the xml schema a bit.