re-add support for leader labels