Added support for multiple override folders