Refactored claims transformation