Broaden to also use it on non-ServerManager secttions