Added support for composite keys