improved support for Tabbed format