Bug 8998 - Adding support for multiple PS