Added changes from utils