Refine connection types handling
Refine log messages