Add transport to Tables
Fix comments partially