Normalization with definitions