Completes the v2.0.0 rewrite