move add_key/remove_key here