Fixed the optimization using containing information
Supplemented the PSM initialization and set default to false