Fixed SWAT manager to work with CSP