More work on sessions