Refactor signaling module.