Changes for the collector tier, with zeromq support