Upgrading HBS to 2.0.0