Connection classes snapshot. Requires refactoring.
Cleanup
Merge branch 'connection'