Changes to complete ZeroMQ integration