Improve attribution