Some improvement are done in class Utils