Shruthi, Sush | #1422 | refactored to move common services out of consultation