Better Attribution support, cleaning