Added folder support