Ok let's keep that as a separate concern then, it's not trivial.

Can you update this one to keep the current properties and apply the matching concern to match the previous behaviour?