[PMSH] Refactoring changes for pmsh csits