Refactor SCP transport