Improve sockets