Update for 0.5.x