Now with the ability to add new keys