Add transport functionality and improve guarding.