Refactoring of Session classes