modularising session service and helpers futher