Update to Hapi V6.0