added sessions and tokens