Changes to use telnet module