adding correct session and tenant info, fix concurrency issue