Marked as a snapshot version
Simplified channel manager to clarify its responsibility
Merge branch 'refactoring/session'