Adding support for composite keys