Prepared for new http server