Some changes in using session