Re-add basic validation