SigmalR sample
Some refactoring