Comments added for potential PSM functionality improvement