Create Address and use it in Donor
Replace plugin with class