Consumer class improvements
More cleaning
Implement session recover.