Add logic to pass signal to callback command.
Refactor delegate module.