Refactors for Hapi 6.0.0^