Add more keys in; validation