Changed some keys to optional.