Better handling of required inputs.