Homogenize the session interface
Optimise imports