Add support for composite hash keys