Modified Socket server methods