Added changes for V0.4