Updated to fit to the 3.0.0-b1 version