Session token can be driven by parameter now
Refactoring