Support for composite primary keys