Added sockets infrastructure