Major refactor in ConsentService