Addressing 2.0.0-rc1 Update