Adding support for composite foreign key references