Add unless option for skipping validations