Moving sockets into socketContexts