Added support for UploadedTo folders