More pages moved to parameter building method