Modified Utils class