Update work improvement
Some Utils