Updated functions to be Data Folder aware