Param building refactoring