Updated NetCom and ServerFactory