Refactoring of PmMessageUtil to PmMessageApi V2