Changed session handling in UI API