Add key validation