Updated version and made FolderID Nullable