Adding more zeromq support