Added per-input validation