Additional param building refactoring