Finalized completor changes