Added directory array support