Some changes to support the complex schema tests.