Work toward 2.0.0 roadmap