refactor use MessageUtility library