Changes for bypassing updating session