Added message handling
Added signalR