Added file/fragment/folder handling