Now supports multiple directories