Improved all utils.