Adding folder support