Make validation sufficient