Refactor TransportBundle to not be dependent on FileInputStream