Add de-duplicator. Improve messages.