End of initial param building refactoring