Refactored transformation policy