Added support for PSO.