Use session object instead of just clientData