Add session.namespace
Refactoring