Update with features of 0.0.3 and upcoming in 0.0.4