More updates to 2.0.0