Rework SmartHttp controller