Additional 3.0 updates