Updated sockets to pair id with values