Move params to array
Enhancements