refactor - use MessageUtility library