Fix Session only few classes