Add KeyVal support to normalizer