Adding back in dictionary key/value type.