Some updates for session