LMW-72 Covert SessionContext to an struct to avoid having to create a private instance