Added v0.0.2 feature