Update for 0.12