Refactor of ZeroMQ Transport