Added functionality to Warhorse and Transporter