Added tables with circular foreign keys