Added some thrift stuffg