Missed some files in utility from the previous commit