Updated initial Util classes.