Some changes to the donor schema and backend logic