Updates for 2.0.6