Prepare for v0.7 features to come