server and http controllers adjusted