added keys and various models