Improve on attaching parameters code
Improve on attaching parameters code