Added in http server and bootstrap