Added Patch folder support