Make unit and parameter not nullable