Change order of constructor params