More XML Changes