Support multiple entries #17198

Allow multiple entries without having the value overwritten
Does this need to be more complex?