Update for Hapi 8