Some bug fixin
Switching to MassTransit