Refactoring command args and change the signal instance implement.