Improvements to the Contribution model