Move code to Transporter