Made optional arguments actually optional