Upgrade to Hapi 6.x