More refactoring of parameters