Add support for composite keys, refs #68