Working on session expired issues