I decided to leave the logic as is and just move it to the dataCollection for now, cause I was expecting @jverghese  to another round of refactoring.