Implemented support for composite keys (untested)