Adding updates for v0.2 tag