Service optimization & futher SignalR work