Added sockets and auth