Hapi 6 update

Closes #5