Refactored surcharge migration