Add support for 3.0.0-beta2