refactor additional info tables and helpers for federation schema