Updated to match new v0.7