Added folder support check