Supporting v0.8 data