More 3.0 changes