[Refactor] Use 'modify' in evalCommand