Thrift with N.M

Thrift with N.M