Added folder array support