Do not remove previously added keys
Actually use type argument when creating keys