Re-adding wrap-params.