Updates for 2.0