Session dependency adjusted to sf 2.1