Modify for v0.2.6