That is a good solution, I will change our data models accordingly.