Added new functionality to make use of the PSO more easily