added folder support