Refactoring issues; unifying transport layer