Modify for v0.16.0