Update for 0.11