Updated socket service. And more.