Added support for capturing the donor_id from the warehouse

Plus another minor enhancements, one per commit.