Add 3.0 support