Adding support for optional parameters.