Added arbitrary folder support