Additional tables, plus PK and FK constraints