Rewrite transport according to the core changes