Simplified the donor schema.