Update for 0.4