Replace TaskFactor by simpler pseudo classes