Make it work with a complicated thrift file