Updates for 11.0