Refactoring (session container in a new singleton)
Class comment, use proper tag for logging
Refactoring