No automatic units, include more input validation