Refactor to support non-IRC connectors
Refactor to support non-IRC connectors