More utils added