Implementation of new design on Donation step, minor refactorings