Update for 0.5.8