Add changes for 0.4.0