Update for 0.6 release