Add changes for v.0.6.0