Added multi folder support