Added XHP, removed zmq