Expand possible parameters and handling.