Bug fixes
Added custom implementation to work with folders