#27 More changes to implement new Session architecture.