Transport layer : Major refactoring