Tweaking utility classes