Patch to support 0.8 data