Updated to 3.0.0-wip