Updated for prefer v0.5.0