Update for 0.5