Adds suports for subfolders