Added support for keys with multiple fields.