Change key type from String to NormalizedKey