Re-added key validation