Modify reactive + session managment