Switch to using socket data