Support added for multiple folders