Fixed partial class definition for PSM