Adding support for multiple folders.