Update for 0.6