Add changes for 0.6