Update for 0.8