Fix on session abstraction