If you use String keys, this will need an update