Basic updates for 3.0