[development] Referential integrity -- finally?