Updated for 0.5.0
0.5.0