Improve handling of unspecified parameters