More sessions improvements