Adding support for composite primary keys.