Improvements into Util directory