Refactoring all transports mechanism
Merging