Refactor the handling the additional options