Improve table_extras calculation

The system now supports any table_extras added via configuration.