APOLLO-4008 refactored donor
APOLLO-4008 Updated annotations