Starting to rework class structure of quenching models