Added changes for InfoFree