Fixed add_key