Updates for 0.06