More 3.0 support