Improve handling of unknown parameters