Foreign keys added, not tested yet