Make management of attribution consistent for all layers