Added support for 2.0.0-p353