Rewrote the param holder generator