For v3.0 development