Add validation (first setup)