Update for 0.9 dev