Refactor to new parameter building method