Added session awareness.