added some accessors and replacement for PSM