Made changed to the util classes.