Added changes for 0.4