Some updates v0.5.0