Upgrade to hbs 2.0