Feature/junhao v0.4 changes