Refactor for target deployment