Upgraded irc-factory