Adds basic validation back