Extracting the session adapter
Map is implemented
Performance "improvements"