Add support for composite keys

No match.