added keys and tokens