Make it work with binary packages / multiple topics