Corrections feature refactored