Changed import/export to new outer_table_wrapper