Add more validation to attribute values