Hey Look at the proposed solution that we can think off - https://drive.google.com/file/d/1vlAKQSs3gdg1UD_s_AlRIZIk8nzsILov/view
Tell me if this works then I’ll implement the solution and I think it will work fine without breaking previous unit test.