Improvements to the attribution