Updated changes for V0.6