add 3.0 support