Add 2.0.0-p0 support