Made oneshot installer more reusable