Fixing reference to old servce SE-186
Logging improvement
Some cleanup and implementing queue in a better way