Update for 0.10