These updates make it easier to implement and pass custom Session and
Context implementations

No compatibilty breaking, all tests pass