Working on v1.0.0-beta4