Add folder support