Added support for sub folders