Rework susbstitution detection models