Added directory check for file sets