Refactoring DIALER toolkit