[PMSH] Refactoring changes for pmsh csits

No match.