Add more changes for strict session