Added folder includes support