Re-order init params and make archiving optional