Updates for 0.6