Merging with alex changes

I created an interface class for handle session, I did also change webse...