Upgraded for http-kit 2.1.1