Changes to use the new SimpleTabsBean