Added support for multiple directories