Folder support added.