Compatibility with yelp-cheetah==0.6.0