More 3.0 updates